Fix break in DirectoryServices SearchResultCollection #113775
+137
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added enumeration handling when the internal ArrayList has already been loaded but an enumeration follows. This fixes the issue with 9.x Linq statements against the collection caused by the access of the .Count Fixes dotnet#113265
dotnet-policy-service
bot
added
the
community-contribution
|
I think the code is the simplest way to fix this issue without making tons more changes. I'm not sure my test class is useful/valid because I'm not on a LDAP domain-joined machine so it simply bypasses for me in local runs. :pointup: @BillArmstrong @stephentoub @tarekgh |
tarekgh
reviewed
Mar 23, 2025
| /// <devdoc> | ||
| /// Supports a simple type-specific wrapper for the underlying cached list | ||
| /// </devdoc> | ||
| private sealed class AlreadyReadResultsEnumerator : IEnumerator |
There was a problem hiding this comment.
Good point, I will adjust after the Blues game.
tarekgh
approved these changes
Mar 23, 2025
There was a problem hiding this comment.
LGTM, thanks @IDisposable
@stephentoub @steveharter could you please have a quick look? Note, this is a candidate for 9.0 service porting .
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added enumeration handling when the internal ArrayList has already been loaded but an enumeration follows. This fixes the issue with 9.x Linq statements against the collection caused by the access of the .Count
Fixes #113265
I am not entirely sure the best way to test this, as we never had tests for this class until now so I created a new DirectorySearcherTests.cs (conditionally run when LDAP is available) using the setup shown in the bur report.